Skip to content

Skip already-contained integration sources#40

Closed
mberman84 wants to merge 1 commit into
mainfrom
codex/skip-contained-integration-sources-20260621
Closed

Skip already-contained integration sources#40
mberman84 wants to merge 1 commit into
mainfrom
codex/skip-contained-integration-sources-20260621

Conversation

@mberman84

@mberman84 mberman84 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Skip frozen source heads already contained transitively by the cumulative integration branch.
  • Recover GitHub empty 204 merge responses only after re-reading the branch and proving exact ancestry.
  • Prevent successful no-op merges from being misclassified as GitHub returned invalid JSON conflicts.

Last-hour incident

Astro integration PR #922 had already merged cumulative PR #916, which contained #912 and #907. DeployBot retried #912, received GitHub's empty no-op response, and created an unnecessary repair handoff.

Composition with v0.2.16

Rebased onto the failed-integration intent-preservation release at 860b5e5257a802faa8a39d34a354484b106e13c3. The combined controller passes all gates.

Validation

  • 213 tests and 201 subtests passed
  • Ruff passed
  • Package build passed
  • CI passed on Python 3.11, 3.12, and 3.13
  • Final autoreview clean, 0.91 confidence

@mberman84 mberman84 force-pushed the codex/skip-contained-integration-sources-20260621 branch from 4ce3009 to 4c44798 Compare June 22, 2026 01:41
@mberman84

Copy link
Copy Markdown
Contributor Author

Superseded by #45, which includes the contained-source/no-op merge recovery together with the dispatch, multi-workflow release-state, and status-path fixes from the broader deploy audit.

@mberman84 mberman84 closed this Jun 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant